From 588a7757f1f2eaa85e8b3a505b760dacbfbadfbf Mon Sep 17 00:00:00 2001 From: parkrrrr Date: Thu, 30 Jun 2005 10:28:04 +0000 Subject: [PATCH] Worked around bug in google XML encoding --- gpsbabel/geo.c | 2 +- gpsbabel/glogbook.c | 2 +- gpsbabel/google.c | 4 ++-- gpsbabel/hiketech.c | 2 +- gpsbabel/kml.c | 2 +- gpsbabel/tef_xml.c | 2 +- gpsbabel/xmlgeneric.c | 4 ++-- gpsbabel/xmlgeneric.h | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c index c8ace7244..11cd0f72d 100644 --- a/gpsbabel/geo.c +++ b/gpsbabel/geo.c @@ -133,7 +133,7 @@ void wpt_coord(const char *args, const char **attrv) void geo_rd_init(const char *fname) { - xml_init(fname, loc_map); + xml_init(fname, loc_map, NULL); } void diff --git a/gpsbabel/glogbook.c b/gpsbabel/glogbook.c index 3fe98162d..b4f59938c 100644 --- a/gpsbabel/glogbook.c +++ b/gpsbabel/glogbook.c @@ -57,7 +57,7 @@ static xg_tag_mapping gl_map[] = { void glogbook_rd_init(const char *fname) { - xml_init(fname, gl_map); + xml_init(fname, gl_map, NULL); } void diff --git a/gpsbabel/google.c b/gpsbabel/google.c index 200f3d215..cbaa5b935 100644 --- a/gpsbabel/google.c +++ b/gpsbabel/google.c @@ -167,7 +167,7 @@ void goog_poly_e( const char *args, const char **unused ) void google_rd_init(const char *fname) { - xml_init(fname, google_map); + xml_init(fname, google_map, "ISO-8859-1" ); } void @@ -184,7 +184,7 @@ google_read(void) if ( end ) { *end = '\0'; xml_deinit(); - xml_init( NULL, google_map ); + xml_init( NULL, google_map, NULL ); xml_readstring( xml ); } } diff --git a/gpsbabel/hiketech.c b/gpsbabel/hiketech.c index b95828246..5e933247c 100644 --- a/gpsbabel/hiketech.c +++ b/gpsbabel/hiketech.c @@ -76,7 +76,7 @@ static xg_tag_mapping ht_map[] = { void hiketech_rd_init(const char *fname) { - xml_init(fname, ht_map); + xml_init(fname, ht_map, NULL); } void diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c index d7c5fa356..c4eea6765 100644 --- a/gpsbabel/kml.c +++ b/gpsbabel/kml.c @@ -139,7 +139,7 @@ static void kml_rd_init(const char *fname) { - xml_init(fname, kml_map); + xml_init(fname, kml_map, NULL); } static diff --git a/gpsbabel/tef_xml.c b/gpsbabel/tef_xml.c index a5e2ac624..885e2d484 100644 --- a/gpsbabel/tef_xml.c +++ b/gpsbabel/tef_xml.c @@ -269,7 +269,7 @@ tef_point(const char *args, const char **attrv) static void tef_xml_rd_init(const char *fname) { - xml_init(fname, tef_xml_map); + xml_init(fname, tef_xml_map, NULL); } /* diff --git a/gpsbabel/xmlgeneric.c b/gpsbabel/xmlgeneric.c index 9aaf23173..9ba56770b 100644 --- a/gpsbabel/xmlgeneric.c +++ b/gpsbabel/xmlgeneric.c @@ -232,7 +232,7 @@ void xml_readstring( char *str ) } void -xml_init(const char *fname, xg_tag_mapping *tbl) +xml_init(const char *fname, xg_tag_mapping *tbl, const char *encoding) { if (fname) { ifd = xfopen(fname, "r", MYNAME); @@ -241,7 +241,7 @@ xml_init(const char *fname, xg_tag_mapping *tbl) current_tag = vmem_alloc(1,0); *((char *)current_tag.mem) = '\0'; - psr = XML_ParserCreate(NULL); + psr = XML_ParserCreate((const XML_Char *)encoding); if (!psr) { fatal(MYNAME ": Cannot create XML Parser\n"); } diff --git a/gpsbabel/xmlgeneric.h b/gpsbabel/xmlgeneric.h index 35758b012..1042766c2 100644 --- a/gpsbabel/xmlgeneric.h +++ b/gpsbabel/xmlgeneric.h @@ -54,7 +54,7 @@ void xml_fill_in_time(char *time_string, const time_t timep, int long_or_short); void write_xml_header(FILE *ofd); -void xml_init(const char *fname, xg_tag_mapping *tbl); +void xml_init(const char *fname, xg_tag_mapping *tbl,const char *encoding); void xml_read(void); void xml_readstring(char *str); void xml_deinit(void); -- 2.30.2